Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 25 Oct 2011 06:15:12 +0000 (23:15 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 25 Oct 2011 06:15:12 +0000 (23:15 -0700)
commit1f1cbc2a42c9ddf7132cd965ada5173d0e698d44
treea3298f09765bb538d10ddcac98cf6b64694af68a
parentef4d9d4f848278cf96d4136aca0806c883d02395
parent32a290304c6ae3745fe2ee4528977f7953a208c0
Merge from trunk.